위젯 검출 정규 표현식을 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2892 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/member/tpl/delete_form.html

@@ -5,7 +5,7 @@
 <form action="./" method="get" onsubmit="return procFilter(this, delete_member)" class="gap1">
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-    <table cellspacing="0" class="tableType4">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
     <tr>

modules/member/tpl/denied_id_list.html

@@ -9,13 +9,18 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="tableType1 gap1">
+<table cellspacing="0" class="adminTable">
+<col width="50" />
+<col width="180" />
+<col />
+<col width="80" />
+<col width="50" />
 <thead>
     <tr>
         <th scope="col">{$lang->no}</th>
         <th scope="col">{$lang->user_id}</th>
-        <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->description}</th>
+        <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->cmd_delete}</th>
     </tr>
 </thead>
@@ -24,8 +29,8 @@
     <tr>
         <td class="tahoma">{$no}</td>
         <td class="tahoma">{$val->user_id}</td>
-        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td>{$val->description}&nbsp;</td>
+        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td class="red"><a href="#" onclick="doUpdateDeniedID('{$val->user_id}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
     </tr>
     <!--@end-->
@@ -50,7 +55,7 @@
 <input type="hidden" name="page" value="{$page}" />
 
 <div>
-    <table cellspacing="0" class="tableType3 gap1">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
     <tr>
@@ -61,11 +66,12 @@
         <th scope="row">{$lang->description}</th>
         <td class="left"><textarea name="description" class="inputTypeTextArea w100"></textarea></td>
     </tr>
+    <tr>
+        <th scope="row" colspan="2" class="button">
+            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
+    </tr>
     </table>
-
-    <div class="tRight gap1">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </div>
 </div>
 
 </form>

modules/member/tpl/filter/delete_profile_image.xml

@@ -0,0 +1 @@
+<filter name="delete_profile_image" module="member" act="procMemberDeleteProfileImage" confirm_msg_code="confirm_delete" />

modules/member/tpl/group_list.html

@@ -10,12 +10,18 @@
 <input type="hidden" name="mode" value="" />
 </form>
 
-<table cellspacing="0" class="tableType1 gap1">
+<table cellspacing="0" class="adminTable">
+<col />
+<col />
+<col width="120" />
+<col width="50" />
+<col width="50" />
+<col width="50" />
 <thead>
     <tr>
         <th scope="col">{$lang->group_title}</th>
-        <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->description}</th>
+        <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->cmd_modify}</th>
         <th scope="col">{$lang->cmd_delete}</th>
@@ -30,8 +36,8 @@
     <!--@foreach($group_list as $group_srl => $group_info)-->
     <tr>
         <td>{$group_info->title}</td>
-        <td class="tahoma">{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
         <td>{nl2br($group_info->description)}&nbsp;</td>
+        <td class="tahoma">{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
         <td class="tahoma">{$group_info->is_default}</td>
         <td class="blue"><a href="{getUrl('group_srl',$group_info->group_srl)}">{$lang->cmd_modify}</a></td>
         <td class="red">
@@ -52,7 +58,7 @@
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="group_srl" value="" />
 
-    <table cellspacing="0" class="tableType3 gap1">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
     <tr>
@@ -67,10 +73,12 @@
         <th scope="row">{$lang->description}</th>
         <td class="left"><textarea name="description" class="inputTypeTextArea w100"></textarea></td>
     </tr>
+    <tr>
+        <th scope="row" colspan="2" class="button">
+            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </th>
+    </tr>
     </table>
 
-    <div class="tRight gap1">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </div>
 
 </form>

modules/member/tpl/group_update_form.html

@@ -7,7 +7,7 @@
 <input type="hidden" name="group_srl" value="{$selected_group->group_srl}" />
 <input type="hidden" name="mode" value="update" />
 <!--@if($selected_group->is_default=='Y')--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-    <table cellspacing="0" class="tableType3 gap1">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
     <tr>
@@ -24,12 +24,13 @@
         <th scope="row">{$lang->description}</th>
         <td class="left"><textarea name="description" class="inputTypeTextArea w100">{$selected_group->description}</textarea></td>
     </tr>
+    <tr>
+        <th scope="row" colspan="2" class="button">
+            <span class="button"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
+        </th>
+    </tr>
     </table>
 
-    <div class="tRight gap1">
-        <span class="button"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
-    </div>
-
 </form>
 <!--@end-->
 

modules/member/tpl/header.html

@@ -3,9 +3,7 @@
 
 <h3>{$lang->member} <span class="gray">{$lang->cmd_management}</span></h3>
 
-<!--@if($act == 'dispMemberAdminList')-->
 <div class="infoText">{nl2br($lang->about_member)}</div>
-<!--@end-->
 
 <div class="header4">
 <!-- 정보 -->

modules/member/tpl/insert_join_form.html

@@ -5,7 +5,7 @@
 <input type="hidden" name="member_join_form_srl" value="{$join_form->member_join_form_srl}" />
 <input type="hidden" name="default_value" value="<!--@if(is_array($join_form->default_value))-->{implode($join_form->default_value,'|@|')}<!--@end-->" />
 
-    <table cellspacing="0" class="tableType2 gap1">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
 
@@ -32,14 +32,14 @@
                         <!--@end-->
                     </select>
                 </div>
-                <div>
+                <div class="gap1">
                     <a href="#" onclick="doEditDefaultValue(this,'up');return false;"><img src="../../admin/tpl/images/button_up.gif" alt="{$lang->cmd_move_up}" width="14" height="14" /></a>
                     <a href="#" onclick="doEditDefaultValue(this,'down');return false;"><img src="../../admin/tpl/images/button_down.gif" alt="{$lang->cmd_move_down}" width="14" height="14" /></a>
-                    <a href="#" onclick="doEditDefaultValue(this, 'delete');return false;">{$lang->cmd_delete}</a>
+                    <a href="#" onclick="doEditDefaultValue(this, 'delete');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
                 </div>
                 <div class="gap1">
                     <input type="text" name="default_value_item" id="default_value_item" class="inputTypeText w400" />
-                    <a href="#" onclick="doEditDefaultValue(this, 'insert');return false;">{$lang->cmd_insert}</a>
+                    <a href="#" onclick="doEditDefaultValue(this, 'insert');return false;" class="button"><span>{$lang->cmd_insert}</span></a>
                 </div>
             </div>
         </td>

modules/member/tpl/insert_member.html

@@ -9,13 +9,11 @@
     <input type="hidden" name="user_id" value="{htmlspecialchars($member_info->user_id)}" />
     <!--@end-->
 
-    <div class="title">
-        {$lang->member_default_info}
-    </div>
 
-    <table cellspacing="0" class="tableType2">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
+    <caption>{$lang->member_default_info}</caption>
     <tr>
         <th scope="row">{$lang->user_id}</th>
         <td>
@@ -143,13 +141,11 @@
     </table>
 
     <!--@if($extend_form_list)-->
-    <div class="title">
-        {$lang->member_extend_info}
-    </div>
 
-    <table cellspacing="0" class="tableType2">
+    <table cellspacing="0" class="adminTable">
     <col width="150" />
     <col />
+    <caption>{$lang->member_extend_info}</caption>
     <!--@foreach($extend_form_list as $key => $val)-->
         <!--@if($val->is_active=='Y')-->
     <tr>

modules/member/tpl/join_form_list.html

@@ -8,7 +8,16 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="tableType1 gap1">
+<table cellspacing="0" class="adminTable">
+<col />
+<col />
+<col />
+<col width="50" />
+<col width="70" />
+<col width="80" />
+<col width="50" />
+<col width="50" />
+<col width="50" />
 <thead>
     <tr>
         <th scope="col">{$lang->column_title}</th>
@@ -39,10 +48,10 @@
         <td class="red"><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</a></td>
     </tr>
     <!--@end-->
+    <tr>
+        <th scope="row" colspan="9" class="button">
+            <a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
+        </th>
+    </tr>
 </tbody>
 </table>
-
-<!-- 가입폼 추가 -->
-<div class="tRight gap1">
-    <a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}" class="button"><span>{$lang->cmd_make}</span></a>
-</div>

modules/member/tpl/js/member_admin.js

@@ -246,7 +246,13 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) {
 }
 
 
-/* 이미지 이름, 마크 삭제 */
+/* 프로필 이미지, 이미지 이름, 마크 삭제 */
+function doDeleteProfileImage(member_srl) {
+    var fo_obj = xGetElementById("fo_image");
+    fo_obj.member_srl.value = member_srl;
+    procFilter(fo_obj, delete_profile_image);
+}
+
 function doDeleteImageName(member_srl) {
     var fo_obj = xGetElementById("fo_image");
     fo_obj.member_srl.value = member_srl;

modules/member/tpl/member_config.html

@@ -6,8 +6,8 @@
 <input type="hidden" name="temp_srl" value="" />
 <input type="hidden" name="agreement" value="{htmlspecialchars($config->agreement)}" />
 
-<table cellspacing="0" class="tableType2 gap1">
-<col width="150" />
+<table cellspacing="0" class="adminTable">
+<col width="180" />
 <col />
     <tr>
         <th scope="row">{$lang->webmaster_name}</th>
@@ -44,6 +44,17 @@
             <p>{$lang->about_limit_day}</p>
         </td>
     </tr>
+    <tr>
+        <th scope="row">{$lang->profile_image}</th>
+        <td>
+            <p>
+                <input type="checkbox" name="profile_image" value="Y" <!--@if($config->profile_image=='Y')-->checked="checked"<!--@end--> class="checkbox" />
+                {$lang->about_profile_image}
+            </p>
+            {$lang->profile_image_max_width} : <input type="text" name="profile_image_max_width" size="3" value="{$config->profile_image_max_width}" class="inputTypeText" />px<br />
+            {$lang->profile_image_max_height} : <input type="text" name="profile_image_max_height" size="3" value="{$config->profile_image_max_height}" class="inputTypeText" />px<br />
+        </td>
+    </tr>
     <tr>
         <th scope="row">{$lang->image_name}</th>
         <td>
@@ -52,7 +63,7 @@
                 {$lang->about_image_name}
             </p>
             {$lang->image_name_max_width} : <input type="text" name="image_name_max_width" size="3" value="{$config->image_name_max_width}" class="inputTypeText" />px<br />
-            {$lang->image_name_max_height} : <input type="text" name="image_name_max_height" size="2" value="{$config->image_name_max_height}" class="inputTypeText" />px<br />
+            {$lang->image_name_max_height} : <input type="text" name="image_name_max_height" size="3" value="{$config->image_name_max_height}" class="inputTypeText" />px<br />
         </td>
     </tr>
     <tr>
@@ -63,7 +74,7 @@
                 {$lang->about_image_mark}
             </p>
             {$lang->image_mark_max_width} : <input type="text" name="image_mark_max_width" size="3" value="{$config->image_mark_max_width}" class="inputTypeText"/>px<br />
-            {$lang->image_mark_max_height} : <input type="text" name="image_mark_max_height" size="2" value="{$config->image_mark_max_height}" class="inputTypeText"/>px<br />
+            {$lang->image_mark_max_height} : <input type="text" name="image_mark_max_height" size="3" value="{$config->image_mark_max_height}" class="inputTypeText"/>px<br />
         </td>
     </tr>
     <tr>
@@ -94,15 +105,16 @@
         <th scope="row">{$lang->colorset}</th>
         <td><div id="member_colorset"></div></td>
     </tr>
+    <tr>
+        <th scope="row" colspan="2" class="button">
+            <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
+            <!--@if($module=="admin")-->
+            <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
+            <!--@end-->
+        </th>
+    </tr>
     </table>
 
-    <div class="tRight gap1">
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        <!--@if($module=="admin")-->
-        <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
-        <!--@end-->
-    </div>
-
 </form>
 
 <script type="text/javascript">

modules/member/tpl/member_info.html

@@ -1,3 +1,4 @@
+<!--%import("filter/delete_profile_image.xml")-->
 <!--%import("filter/delete_image_name.xml")-->
 <!--%import("filter/delete_image_mark.xml")-->
 <!--#include("header.html")-->
@@ -7,7 +8,7 @@
     <input type="hidden" name="member_srl" />
 </form>
 
-<table cellspacing="0" class="tableType4 gap1">
+<table cellspacing="0" class="adminTable">
 <col width="150" />
 <col />
 <tr>
@@ -22,6 +23,28 @@
     <th scope="row">{$lang->nick_name}</th>
     <td>{htmlspecialchars($member_info->nick_name)}</td>
 </tr>
+<tr>
+    <th scope="row" rowspan="2">{$lang->profile_image}</th>
+    <td>
+        <!--@if($member_info->profile_image->src)-->
+        <img src="{$member_info->profile_image->src}" border="0" alt="profile_image" />
+        <a href="#" onclick="doDeleteProfileImage({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+        <!--@else-->
+        &nbsp;
+        <!--@end-->
+    </td>
+</tr>
+<tr>
+    <td>
+        <form action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
+        <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
+        <input type="hidden" name="module" value="member" />
+        <input type="hidden" name="act" value="procMemberInsertProfileImage" />
+            <input type="file" name="profile_image" value="" />
+            <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
+        </form>
+    </td>
+</tr>
 <tr>
     <th scope="row" rowspan="2">{$lang->image_name}</th>
     <td>

modules/member/tpl/member_list.html

@@ -2,7 +2,7 @@
 <!--#include("header.html")-->
 
 <!-- 목록 -->
-<table cellspacing="0" class="tableType1">
+<table cellspacing="0" class="adminTable">
 <thead>
     <tr>
         <th scope="col">{$lang->no}</th>
@@ -27,7 +27,7 @@
         <td class="tahoma">{$val->denied}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td class="tahoma">{zdate($val->last_login,"Y-m-d H:i:s")}</td>
-        <td class="red"><!--@if($val->is_admin!='Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
+        <td class="red"><!--@if($val->is_admin!='Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}">{$lang->cmd_delete}</a><!--@else-->&nbsp;<!--@end--></td>
     </tr>
     <!--@end-->
 </tbody>