diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html index 16e953cbc..40eee2378 100644 --- a/modules/addon/tpl/addon_info.html +++ b/modules/addon/tpl/addon_info.html @@ -1,58 +1,34 @@ - --- - - - - - - - - - - - - - - - - - - - - - - +
+

{$lang->addon_maker}

+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$lang->addon_maker}
{$lang->title}{$addon_info->title} ver. {$addon_info->version}
{$lang->author}{$addon_info->author->name}
{$lang->homepage}{$addon_info->author->homepage}
{$lang->regdate}{$addon_info->author->date}
{$lang->description}{nl2br($addon_info->author->description)}
{$lang->addon_history}
{$lang->name}{$history->name}
{$lang->homepage}{$history->homepage}
{$lang->regdate}{$history->date}
{$lang->description}{nl2br($history->description)}
- {$lang->cmd_close} -
+
+ + + + + + + + + + + + + + + + + + + + + + +
{$addon_info->title} ver. {$addon_info->version}
{$addon_info->author->name}
{$addon_info->author->homepage}
{$addon_info->author->date} +
{$lang->description}{nl2br($addon_info->author->description)}
+
+ +
+ {$lang->cmd_close} +
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html index d247ae67b..d6e64b469 100644 --- a/modules/addon/tpl/setup_addon.html +++ b/modules/addon/tpl/setup_addon.html @@ -1,41 +1,47 @@ -
-
- - +
+

{$lang->cmd_setup}

+
+ + + + +
+
+ + - + - - + + - - - - - + + - - - - - - - - - - + +
{$lang->title} {$addon_info->title} ver. {$addon_info->version}
{$lang->author}{$addon_info->author->name}{$addon_info->author->name}
{$lang->homepage}{$addon_info->author->homepage}
{$lang->extra_vars}{$addon_info->author->homepage}
{$val->title}
{$val->description}
- - + {$val->title} + +

{$val->description}
-
-
+ + + +
+ +
+ + diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 4bcbf249b..013f0790d 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -20,6 +20,7 @@ IE7 Only .inputTypeText:hover, .inputTypeText:focus { background:#f4f4f4;} .inputTypeTextArea { border:1px solid #c9c9c9; padding:3px; background:#ffffff;} +.inputTypeDate { width:10em; border:1px solid #c9c9c9; padding:3px; height:1em; line-height:1em; background:#ffffff;} /* Internet Explorer 6 PNG Bug Fix */ .iePngFix { behavior:url(../js/iePngFix.htc);} @@ -160,7 +161,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: /* ----- Popup | Start ----- */ /* popup */ -#popHeadder { height:40px; background:url(../images/popupTopBg.png) repeat-x left top;} +#popHeadder { width:500px; height:40px; background:url(../images/popupTopBg.png) repeat-x left top;} #popHeadder h1 { padding:13px 0 0 19px; height:27px; background:url(../images/popupTopBgEnd.png) no-repeat right top; font-size:1.2em; color:#d8d8d8;} #popBody { padding:1em; background:#ffffff;} #popFooter { background:#f7f7f6; border-top:1px solid #e8e8e7; padding:.5em 0 .5em 0; overflow:hidden; width:100%;} diff --git a/modules/layout/tpl/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html index 7bff986fa..b8ad4539c 100644 --- a/modules/layout/tpl/layout_detail_info.html +++ b/modules/layout/tpl/layout_detail_info.html @@ -1,56 +1,34 @@ - --- - - - - - - - - - - - - - - - - - - - - - - - - - +
+

{$lang->layout_maker}

+
- - - - - - - - - - - - - - - - - - - - - - - -
{$lang->layout_maker}
{$lang->title}{$layout_info->title} ver {$layout_info->version}
{$lang->author}{$layout_info->author->name}
{$lang->homepage}{$layout_info->author->homepage}
{$lang->regdate}{$layout_info->author->date}
{$lang->description}{nl2br($layout_info->author->description)}
{$lang->layout_history}
{$lang->name}{$history->name}
{$lang->homepage}{$history->homepage}
{$lang->regdate}{$history->date}
{$lang->description}{nl2br($history->description)}
- {$lang->cmd_close} -
+
+ + + + + + + + + + + + + + + + + + + + + + + +
{$lang->title}{$layout_info->title} ver {$layout_info->version}
{$lang->author}{$layout_info->author->name}
{$lang->homepage}{$layout_info->author->homepage}
{$lang->regdate}{$layout_info->author->date}
{$lang->description}{nl2br($layout_info->author->description)}
+
+ +
+ {$lang->cmd_close} +
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index b931e8e6d..ad788940b 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1005,7 +1005,11 @@ // 세션에 저장 $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); - $_SESSION['logged_info'] = $member_info; + + $logged_info = Context::get('logged_info'); + if($logged_info->member_srl == $member_srl) { + $_SESSION['logged_info'] = $member_info; + } $output->add('member_srl', $args->member_srl); return $output; diff --git a/modules/member/tpl/filter/insert.xml b/modules/member/tpl/filter/insert.xml index 664b9583d..615692399 100644 --- a/modules/member/tpl/filter/insert.xml +++ b/modules/member/tpl/filter/insert.xml @@ -1,6 +1,6 @@
- + diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 490a548d2..2f674300c 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -1,14 +1,6 @@ -
- - {$lang->msg_new_member} - - {$lang->msg_update_member} - -
- @@ -17,164 +9,155 @@ -
+
{$lang->member_default_info}
- + +
+ + - + - - - - + - - - - + - - - - + - - - - + - - - - + - + + - - - - - - - - + - - - - + - - + + - - - - + - + + - - + + - - - - - - - - - - - + - - -
{$lang->user_id}{$lang->user_id} {htmlspecialchars($member_info->user_id)} - + +

{$lang->about_user_id}
{$lang->about_user_id}
{$lang->password} - +
{$lang->user_name}{$lang->user_name} - + +

{$lang->about_user_name}
{$lang->about_user_name}
{$lang->nick_name}{$lang->nick_name} - + +

{$lang->about_nick_name}
{$lang->about_nick_name}
{$lang->email_address} - +
{$lang->homepage}{$lang->homepage} - + +

{$lang->about_homepage}
{$lang->about_homepage}
{$lang->blog}{$lang->blog} - +
{$lang->about_blog}
{$lang->birthday}{$lang->birthday} - {zdate($member_info->birthday,"Y-m-d")} - [{$lang->cmd_open_calendar}] + + +

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

{$lang->about_allow_message}
{$lang->about_allow_message}
{$lang->signature}{$lang->signature} {$editor}
{$lang->denied}denied=='Y')-->checked="true"/>{$lang->denied} + denied=='Y')-->checked="true"/> +

{$lang->about_denied}

+
{$lang->about_denied}
{$lang->limit_date}{$lang->limit_date} - {zdate($member_info->limit_date,"Y-m-d")} - [{$lang->cmd_open_calendar}] + +

{$lang->about_limit_date}
{$lang->about_limit_date}{$lang->is_admin} + is_admin=='Y')-->checked="true"/> +

{$lang->about_is_admin}

+
{$lang->is_admin}is_admin=='Y')-->checked="true"/>{$lang->description} + +

{$lang->about_description}

+
{$lang->about_is_admin}
{$lang->description}
{$lang->about_description}
{$lang->group}{$lang->group} - group_list[$key])-->checked="true"/> + group_list[$key])-->checked="true" class="checkbox" /> +

{$lang->about_group}
{$lang->about_group}
-
+
{$lang->member_extend_info}
- +
+ + - - - -
+ * @@ -183,25 +166,25 @@ - + - + - + - - - - - + - + - + - + @@ -224,7 +207,7 @@
- +
- +
- +
- + - {zdate($val->value,"Y-m-d")} - [{$lang->cmd_open_calendar}] + - +

{htmlspecialchars($val->description)}

{htmlspecialchars($val->description)}
- - - - -
- - - - - - -
+ diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html index 4fdcb54fd..72a6b3e6e 100644 --- a/modules/member/tpl/member_info.html +++ b/modules/member/tpl/member_info.html @@ -1,27 +1,29 @@ - +
- +
++ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - -
{$lang->user_id}{$lang->user_id} {htmlspecialchars($member_info->user_id)}
{$lang->user_name}{$lang->user_name} {htmlspecialchars($member_info->user_name)}
{$lang->nick_name}{$lang->nick_name} {htmlspecialchars($member_info->nick_name)}
{$lang->image_name}{$lang->image_name}
@@ -41,7 +43,7 @@
{$lang->image_mark}{$lang->image_mark}
@@ -61,39 +63,39 @@
{$lang->email_address}{$lang->email_address} {htmlspecialchars($member_info->email_address)}
{$lang->homepage}{$lang->homepage} {htmlspecialchars($member_info->homepage)}
{$lang->blog}{$lang->blog} {htmlspecialchars($member_info->blog)}
{$lang->birthday}{$lang->birthday} {zdate($member_info->birthday,'Y-m-d')}
{$lang->allow_mailing}{$lang->allow_mailing} {$member_info->allow_mailing}
{$lang->allow_message}{$lang->allow_message} {$lang->allow_message_type[$member_info->allow_message]}
{$lang->signature}{$lang->signature} {$member_info->signature}
{$lang->denied}{$lang->denied} {$member_info->denied}
{$lang->limit_date}{$lang->limit_date} {zdate($member_info->limit_date,"Y-m-d H:i")} @@ -101,11 +103,11 @@
{$lang->is_admin}{$lang->is_admin} {$member_info->is_admin}
{$lang->group}{$lang->group} {$val} @@ -115,7 +117,7 @@
{htmlspecialchars($val->column_title)}{htmlspecialchars($val->column_title)} {htmlspecialchars($val->value[0])} - {htmlspecialchars($val->value[1])} - {htmlspecialchars($val->value[2])} @@ -133,16 +135,19 @@
{$lang->description}{$lang->description} {htmlspecialchars($member_info->description)}
- - - -
+ +