From 898eb994697f503b1e4c76568b6092510d751671 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 26 Jun 2007 09:18:42 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1772 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- modules/addon/tpl/addon_list.html | 10 ++- modules/admin/tpl/css/admin.css | 16 +++-- modules/blog/blog.admin.controller.php | 2 +- modules/blog/tpl/category_info.html | 5 +- modules/blog/tpl/category_list.html | 25 +++---- modules/blog/tpl/js/blog_admin.js | 35 ++++++++-- modules/board/tpl/category_list.html | 8 ++- modules/editor/tpl/admin_index.html | 4 +- modules/file/tpl/file_config.html | 6 +- modules/file/tpl/file_list.html | 4 +- modules/layout/lang/ko.lang.php | 2 +- .../layout/tpl/downloaded_layout_list.html | 8 +-- modules/layout/tpl/index.html | 10 ++- modules/layout/tpl/layout_edit.html | 30 ++++---- modules/layout/tpl/layout_modify.html | 25 ++++--- modules/member/member.controller.php | 6 +- modules/member/tpl/member_config.html | 14 ++-- modules/member/tpl/member_info.html | 70 +++++++++++-------- modules/member/tpl/member_list.html | 2 +- modules/menu/tpl/js/menu_admin.js | 25 ++++++- modules/menu/tpl/menu_item_info.html | 8 ++- modules/menu/tpl/menu_management.html | 16 +++-- modules/message/conf/info.xml | 2 +- modules/page/tpl/page_insert.html | 8 ++- .../widget/tpl/downloaded_widget_list.html | 6 +- 26 files changed, 214 insertions(+), 135 deletions(-) diff --git a/config/config.inc.php b/config/config.inc.php index eb2102ffc..dfd823245 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -15,7 +15,7 @@ * 0 : files/_debug_message.php 에 연결하여 출력 * 1 : Response Method 가 XML 형식이 아닐 경우 브라우저에 최상단에 주석으로 표시 **/ - define('__DEBUG_OUTPUT__', 1); + define('__DEBUG_OUTPUT__', 0); /** * @brief 디버깅 메세지 출력 diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html index 4f2638d2e..04aa889ff 100644 --- a/modules/addon/tpl/addon_list.html +++ b/modules/addon/tpl/addon_list.html @@ -18,7 +18,6 @@ {$lang->author} {$lang->date} {$lang->installed_path} - {$lang->addon_info} {$lang->cmd_setup} {$lang->use} @@ -28,26 +27,25 @@ - {$val->title}
+ {$val->title}
({$val->addon}) {$val->version} {$val->author->name} {$val->author->date} {$val->path} - {$lang->cmd_view} - {$lang->cmd_setup} + {$lang->cmd_setup}   - {$lang->notuse} - {$lang->use} + + {$lang->notuse} diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index a3a4759a7..abac39c7f 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -119,6 +119,9 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .tableType2 td .w100 { width:100%; display:block;} .tableType2 td .checkbox { margin:-3px;} .tableType2 td p { line-height:1.4em;} +.tableType2 td a { color:#1d1d1d;} +.tableType2 td a.blue { color:#158692;} +.tableType2 td a.red { color:#c95b53;} .tableType3 { width:100%; border-bottom:2px solid #c1c0bd;} .tableType3 th, @@ -160,6 +163,10 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .tableType4 td .checkbox { margin:-3px;} .tableType4 td p { line-height:1.4em;} +.widgetBox { border:1px solid #c1c0bd; width:100%;} +.widgetBox th { text-align:center; font-weight:normal; background-color:#EFEFEF; } +.widgetBox td { text-align:left; padding:.5em; } + /* ----- Content | End ----- */ /* ----- Popup | Start ----- */ @@ -185,14 +192,15 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: /* ----- Popup | End ----- */ /* ----- Category Manager | Start ----- */ -#category_list { float:left; width:320px; padding:.5em 0 .5em 0; margin-bottom:2em; border-top:2px solid #c1c0bd; border-bottom:2px solid #c1c0bd;} +#category_list { padding:.5em 0 .5em 0; margin-bottom:2em; } #category_list .checkbox { margin-top:1em; border:0px; } -#menu_zone_info, #category_info { float:left; width:370px; padding-left:10px; } +#menu_zone_info { position:absolute; top:0px; left:0px; width:600px; background-color:#FFFFFF; z-index:999; border:1px solid #888888; padding:10px; display:none;} +#category_info { position:absolute; top:0px; left:0px; width:400px; background-color:#FFFFFF; z-index:999; border:1px solid #888888; padding:10px; display:none;} /* ----- Category Manager | End ----- */ -.widget_item { float: left; white-space:nowrap; background-color:#FEFEFE; line-height:150%; margin-right:1em; } +.widget_item { margin-bottom:.5em; } +.layout_editor { width:100%; height:500px; border:0px; font-size:1em; } .layout_editor_box { padding:10px; border:1px solid #DDDDDD; } -.layout_editor { width:100%; height:500px; border:0px;} /* adminSearch */ .adminSearch { text-align:center; clear:both; width:100%;} diff --git a/modules/blog/blog.admin.controller.php b/modules/blog/blog.admin.controller.php index a4fc5626b..68c8f6f8d 100644 --- a/modules/blog/blog.admin.controller.php +++ b/modules/blog/blog.admin.controller.php @@ -413,7 +413,7 @@ return $output; } - $oDocumentController = &getController('document'); + $oDocumentController = &getAdminController('document'); $output = $oDocumentController->deleteCategory($args->category_srl); if(!$output->toBool()) { $oDB->rollback(); diff --git a/modules/blog/tpl/category_info.html b/modules/blog/tpl/category_info.html index 9becfbc4e..55cb0f01f 100644 --- a/modules/blog/tpl/category_info.html +++ b/modules/blog/tpl/category_info.html @@ -35,11 +35,12 @@ - -