From bb28cb013b75d145b7c8154a62028303b0f12298 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 18 Apr 2007 05:53:27 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1215
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/counter/conf/module.xml               |  1 -
 plugins/login_info/login_info.class.php       |  3 +-
 .../login_info/skins/default/login_form.html  | 35 +++++++
 .../login_info/skins/default/login_info.html  | 96 ++++++-------------
 4 files changed, 67 insertions(+), 68 deletions(-)
 create mode 100644 plugins/login_info/skins/default/login_form.html

diff --git a/modules/counter/conf/module.xml b/modules/counter/conf/module.xml
index 3d6cca8f3..d3edf46bc 100644
--- a/modules/counter/conf/module.xml
+++ b/modules/counter/conf/module.xml
@@ -2,7 +2,6 @@
 <module>
     <grants />
     <actions>
-        <action name="dispCounterAdminIndex" type="view" admin_index="true" standalone="true" />
         <action name="procCounterExecute" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/plugins/login_info/login_info.class.php b/plugins/login_info/login_info.class.php
index 230a13c2d..aa7ff612e 100644
--- a/plugins/login_info/login_info.class.php
+++ b/plugins/login_info/login_info.class.php
@@ -24,7 +24,8 @@
             Context::set('colorset', $args->colorset);
 
             // 템플릿 파일을 지정
-            $tpl_file = 'login_info';
+            if(Context::get('is_logged')) $tpl_file = 'login_info';
+            else $tpl_file = 'login_form';
 
             // 템플릿 컴파일
             $oTemplate = new TemplateHandler();
diff --git a/plugins/login_info/skins/default/login_form.html b/plugins/login_info/skins/default/login_form.html
new file mode 100644
index 000000000..2125435b9
--- /dev/null
+++ b/plugins/login_info/skins/default/login_form.html
@@ -0,0 +1,35 @@
+<!-- colorset의 값에 따라 css 파일을 import 한다 -->
+<!--@if($colorset=="normal"||!$colorset)-->
+    <!--%import("normal/style.css")-->
+<!--@end-->
+
+<!--%import("./filter/login.xml")-->
+<!--%import("./js/login.js")-->
+
+<div class="login_plugin">
+    <form action="./" method="get" onsubmit="return procFilter(this, plugin_login)" id="fo_login_plugin">
+        <div class="login_box">
+            <div class="header">{$lang->user_id}</div>
+            <div class="body">
+                <div><input type="text" name="user_id" id="login_form_user_id" class="input" /></div>
+                <div>
+                    <input type="checkbox" name="remember_user_id" id="chk_remember_user_id" value="Y" />
+                    <label for="chk_remember_user_id">{$lang->remember_user_id}</label>
+                </div>
+            </div>
+
+
+            <div class="header">{$lang->password}</div>
+            <div class="body"><input type="password" name="password" class="input" /></div>
+        </div>
+
+        <div class="button_area">
+            <input type="submit" value="{$lang->cmd_login}" class="submit_button" /> 
+            <input type="button" value="{$lang->cmd_signup}" class="signup_button" onclick="location.href='{getUrl('act','dispMemberSignUpForm')}';return false;" />
+        </div>
+    </form>
+
+    <script type="text/javascript">
+        xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_plugin"); });
+    </script>
+</div>
diff --git a/plugins/login_info/skins/default/login_info.html b/plugins/login_info/skins/default/login_info.html
index 0c8926854..d2c322f47 100644
--- a/plugins/login_info/skins/default/login_info.html
+++ b/plugins/login_info/skins/default/login_info.html
@@ -3,81 +3,45 @@
     <!--%import("normal/style.css")-->
 <!--@end-->
 
-<!-- 로그인 사용자일 경우 로그인 정보를 출력 -->
-<!--@if($logged_info)-->
-    <!--%import("./filter/logout.xml")-->
-    <div class="login_plugin">
+<!--%import("./filter/logout.xml")-->
+<div class="login_plugin">
 
-        <!-- 닉네임 + 로그아웃 -->
-        <div class="top_box">
-            <div class="logout">
-                <a href="#" onclick="location.href='{getUrl('act','dispMemberLogout')}';return false;">{$lang->cmd_logout}</a>
-            </div>
-            <div class="nick_name">
-                <div class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</div>
-            </div>
+    <!-- 닉네임 + 로그아웃 -->
+    <div class="top_box">
+        <div class="logout">
+            <a href="#" onclick="location.href='{getUrl('act','dispMemberLogout')}';return false;">{$lang->cmd_logout}</a>
         </div>
-
-        <div class="info_box">
-
-            <!-- 정보 수정 링크 -->
-            <div class="member_info">
-                <a href="#" onclick="location.href='{getUrl('act','dispMemberInfo')}';return false;">{$lang->cmd_view_member_info}</a>
-            </div>
-
-            <div class="friend_list">
-                <a href="#" onclick="popopen('{getUrl('','module','member','act','dispMemberFriend')}','sendMessage');return false;">{$lang->cmd_view_friend}</a>
-            </div>
-
-            <div class="message_box">
-                <a href="#" onclick="location.href='{getUrl('act','dispMemberMessages')}';return false;">{$lang->cmd_view_message_box}</a>
-            </div>
-
-            <!-- 관리자일 경우 관리자 링크 -->
-            <!--@if($logged_info->is_admin=="Y")-->
-                <div class="link_admin">
-                    <a href="#" onclick="winopen('./?module=admin');return false;">{$lang->cmd_management}</a>
-                </div>
-            <!--@end-->
-
-            <!-- 최종 록그인 시간 -->
-            <div class="last_login">
-                {$lang->last_login} : {zDate($logged_info->last_login, "Y-m-d H:i")}
-            </div>
-
+        <div class="nick_name">
+            <div class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</div>
         </div>
     </div>
 
-<!-- 비로그인 사용자일 경우 로그인 폼을 출력 -->
-<!--@else-->
-    <!--%import("./filter/login.xml")-->
-    <!--%import("./js/login.js")-->
+    <div class="info_box">
 
-    <div class="login_plugin">
-        <form action="./" method="get" onsubmit="return procFilter(this, plugin_login)" id="fo_login_plugin">
-            <div class="login_box">
-                <div class="header">{$lang->user_id}</div>
-                <div class="body">
-                    <div><input type="text" name="user_id" id="login_form_user_id" class="input" /></div>
-                    <div>
-                        <input type="checkbox" name="remember_user_id" id="chk_remember_user_id" value="Y" />
-                        <label for="chk_remember_user_id">{$lang->remember_user_id}</label>
-                    </div>
-                </div>
+        <!-- 정보 수정 링크 -->
+        <div class="member_info">
+            <a href="#" onclick="location.href='{getUrl('act','dispMemberInfo')}';return false;">{$lang->cmd_view_member_info}</a>
+        </div>
 
+        <div class="friend_list">
+            <a href="#" onclick="popopen('{getUrl('','module','member','act','dispMemberFriend')}','sendMessage');return false;">{$lang->cmd_view_friend}</a>
+        </div>
 
-                <div class="header">{$lang->password}</div>
-                <div class="body"><input type="password" name="password" class="input" /></div>
+        <div class="message_box">
+            <a href="#" onclick="location.href='{getUrl('act','dispMemberMessages')}';return false;">{$lang->cmd_view_message_box}</a>
+        </div>
+
+        <!-- 관리자일 경우 관리자 링크 -->
+        <!--@if($logged_info->is_admin=="Y")-->
+            <div class="link_admin">
+                <a href="#" onclick="winopen('./?module=admin');return false;">{$lang->cmd_management}</a>
             </div>
+        <!--@end-->
 
-            <div class="button_area">
-                <input type="submit" value="{$lang->cmd_login}" class="submit_button" /> 
-                <input type="button" value="{$lang->cmd_signup}" class="signup_button" onclick="location.href='{getUrl('act','dispMemberSignUpForm')}';return false;" />
-            </div>
-        </form>
+        <!-- 최종 록그인 시간 -->
+        <div class="last_login">
+            {$lang->last_login} : {zDate($logged_info->last_login, "Y-m-d H:i")}
+        </div>
 
-        <script type="text/javascript">
-            xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_plugin"); });
-        </script>
     </div>
-<!--@end-->
+</div>