Merge branch 'master' of github.com:gnuboard/g4s

2013-03-05 15:08:21 +09:00
parent 5d4b15f395 6366491526
commit a3512c4187
26 changed files with 238 additions and 121 deletions
--- a/mobile/skin/member/basic/formmail.skin.php
+++ b/mobile/skin/member/basic/formmail.skin.php
@ -28,7 +28,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <? } ?>
    <tr>
        <th scope="row"><label for="subject">제목<strong class="sound_only">필수</strong></label></th>
-        <td><input type=text id="subject" name="subject" class="frm_input required" required></td>
+        <td><input type="text" id="subject" name="subject" class="frm_input required" required></td>
    </tr>
    <tr>
        <th scope="row">형식</th>
--- a/mobile/skin/member/basic/memo_form.skin.php
+++ b/mobile/skin/member/basic/memo_form.skin.php
@ -19,7 +19,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        <tr>
            <th scope="row"><label for="me_recv_mb_id">받는 회원아이디<strong class="sound_only">필수</strong></label></th>
            <td>
-                <input type="text" id="me_recv_mb_id" name="me_recv_mb_id" class="frm_input required" size="47" required value="<?=$me_recv_mb_id?>">
+                <input type="text" id="me_recv_mb_id" name="me_recv_mb_id" class="frm_input required" required value="<?=$me_recv_mb_id?>">
                <span class="frm_info">여러 회원에게 보낼때는 컴마(,)로 구분하세요.</span>
            </td>
        </tr>
--- a/mobile/skin/member/basic/password_lost.skin.php
+++ b/mobile/skin/member/basic/password_lost.skin.php
@ -11,8 +11,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
            회원가입 시 등록하신 이메일 주소를 입력해 주세요.<br>
            해당 이메일로 아이디와 패스워드 정보를 보내드립니다.
        </p>
-        <label for="mb_email">E-mail 주소<strong class="sound_only">필수</strong></label>
-        <input type="text" id="mb_email" name="mb_email" class="fs_input email" required size="30">
+        <input type="text" id="mb_email" name="mb_email" class="frm_input email" required placeholder="이메일주소(필수)" title="이메일주소(필수)">
    </fieldset>
    <?=captcha_html(); ?>
    <div class="btn_win">
@ -30,9 +29,6 @@ function fpasswordlost_submit(f)
    return true;
 }

-self.focus();
-document.fpasswordlost.mb_email.focus();
-
 $(function() {
    var sw = screen.width;
    var sh = screen.height;
--- a/mobile/skin/member/basic/register_form.skin.php
+++ b/mobile/skin/member/basic/register_form.skin.php
@ -20,9 +20,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_id">아이디<strong class="sound_only">필수</strong></label></th>
    <td>
+        <span class="frm_info">영문자, 숫자, _ 만 입력 가능. 최소 3자이상 입력하세요.</span>
        <input type="text" id="reg_mb_id" name="mb_id" class="frm_input minlength_3 <?=$required?> <?=$readonly?>" value="<?=$member['mb_id']?>" maxlength="20" <?=$required?> <?=$readonly?>>
        <span id="msg_mb_id"></span>
-        <span class="frm_info">영문자, 숫자, _ 만 입력 가능. 최소 3자이상 입력하세요.</span>
    </td>
 </tr>
 <tr>
@ -40,21 +40,21 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
    <td>
-        <input id="reg_mb_name" name="mb_name" class="frm_input hangul nospace <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" size="10" <?=$required?> <?=$readonly?>>
        <? if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } ?>
+        <input type="text" id="reg_mb_name" name="mb_name" class="frm_input hangul nospace <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" <?=$required?> <?=$readonly?>>
    </td>
 </tr>
 <? if ($req_nick) { ?>
 <tr>
    <th scope="row"><label for="reg_mb_nick">별명<strong class="sound_only">필수</strong></label></th>
    <td>
-        <input type="hidden" name="mb_nick_default" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>">
-        <input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required nospace" maxlength="20" size="10" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required>
-        <span id="msg_mb_nick"></span>
        <span class="frm_info">
            공백없이 한글,영문,숫자만 입력 가능 (한글2자, 영문4자 이상)<br>
            별명을 바꾸시면 앞으로 <?=(int)$config['cf_nick_modify']?>일 이내에는 변경 할 수 없습니다.
        </span>
+        <input type="hidden" name="mb_nick_default" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>">
+        <input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required nospace" maxlength="20" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required>
+        <span id="msg_mb_nick"></span>
    </td>
 </tr>
 <? } ?>
@ -62,21 +62,21 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_email">E-mail<? if ($config['cf_use_email_certify']) {?><strong class="sound_only">필수</strong><?}?></label></th>
    <td>
-        <input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
-        <input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" size="50" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?>>
        <? if ($config['cf_use_email_certify']) { ?>
        <span class="frm_info">
            <? if ($w=='') { echo "E-mail 로 발송된 내용을 확인한 후 인증하셔야 회원가입이 완료됩니다."; } ?>
            <? if ($w=='u') { echo "E-mail 주소를 변경하시면 다시 인증하셔야 합니다."; } ?>
        </span>
        <? } ?>
+        <input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
+        <input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?>>
    </td>
 </tr>

 <? if ($config['cf_use_homepage']) { ?>
 <tr>
    <th scope="row"><label for="reg_mb_homepage">홈페이지<? if ($config['cf_req_homepage']){?><strong class="sound_only">필수</strong><?}?></label></th>
-    <td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" size="50" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
+    <td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
 </tr>
 <? } ?>

@ -103,12 +103,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
        <? if ($config['cf_req_addr']) {?><strong class="sound_only">필수</strong><? } ?>
    </th>
    <td>
-        <input type="text" id="reg_mb_zip1" name="mb_zip1" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip1']?>" title="우편번호 앞자리">
+        <input type="text" id="reg_mb_zip1" name="mb_zip1" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip1']?>" title="우편번호 앞자리">
         -
-        <input type="text" id="reg_mb_zip2" name="mb_zip2" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip2']?>" title="우편번호 뒷자리">
+        <input type="text" id="reg_mb_zip2" name="mb_zip2" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip2']?>" title="우편번호 뒷자리">
        <a href="<? echo $zip_href; ?>" id="reg_zip_find" class="btn_frmline win_zip_find" target="_blank">주소찾기</a>
-        <input type="text" id="reg_mb_addr1" name="mb_addr1" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr1']?>" title="행정구역주소">
-        <input type="text" id="reg_mb_addr2" name="mb_addr2" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" size="50" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr2']?>" title="상세주소">
+        <input type="text" id="reg_mb_addr1" name="mb_addr1" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr1']?>" title="행정구역주소">
+        <input type="text" id="reg_mb_addr2" name="mb_addr2" class="frm_input frm_address <?=$config['cf_req_addr']?"required":"";?>" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_addr2']?>" title="상세주소">
    </td>
 </tr>
 <? } ?>
@ -134,15 +134,15 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_icon">회원아이콘</label></th>
    <td>
+        <span class="frm_info">
+            이미지 크기는 가로 <?=$config['cf_member_icon_width']?>픽셀, 세로 <?=$config['cf_member_icon_height']?>픽셀 이하로 해주세요.<br>
+            gif만 가능하며 용량 <?=number_format($config['cf_member_icon_size'])?>바이트 이하만 등록됩니다.
+        </span>
        <input type="file" id="reg_mb_icon" name="mb_icon" class="frm_input">
        <? if ($w == 'u' && file_exists($mb_icon)) { ?>
        <input type="checkbox" id="del_mb_icon" name="del_mb_icon" value="1">
        <label for="del_mb_icon">삭제</label>
        <? } ?>
-        <span class="frm_info">
-            이미지 크기는 가로 <?=$config['cf_member_icon_width']?>픽셀, 세로 <?=$config['cf_member_icon_height']?>픽셀 이하로 해주세요.<br>
-            gif만 가능하며 용량 <?=number_format($config['cf_member_icon_size'])?>바이트 이하만 등록됩니다.
-        </span>
    </td>
 </tr>
 <? } ?>
@ -169,23 +169,23 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <tr>
    <th scope="row"><label for="reg_mb_open">정보공개</label></th>
    <td>
-        <input type="hidden" name="mb_open_default" value="<?=$member['mb_open']?>">
-        <input type="checkbox" id="reg_mb_open" name="mb_open" value="1" <?=($w=='' || $member['mb_open'])?'checked':'';?>>
-        다른분들이 나의 정보를 볼 수 있도록 합니다.
        <span class="frm_info">
            정보공개를 바꾸시면 앞으로 <?=(int)$config['cf_open_modify']?>일 이내에는 변경이 안됩니다.
        </span>
+        <input type="hidden" name="mb_open_default" value="<?=$member['mb_open']?>">
+        <input type="checkbox" id="reg_mb_open" name="mb_open" value="1" <?=($w=='' || $member['mb_open'])?'checked':'';?>>
+        다른분들이 나의 정보를 볼 수 있도록 합니다.
    </td>
 </tr>
 <? } else { ?>
 <tr>
    <th scope="row">정보공개</th>
    <td>
-        <input type="hidden" name="mb_open" value="<?=$member['mb_open']?>">
        <span class="frm_info">
            정보공개는 수정후 <?=(int)$config['cf_open_modify']?>일 이내, <?=date("Y년 m월 j일", isset($member['mb_open_date']) ? strtotime("{$member['mb_open_date']} 00:00:00")+$config['cf_open_modify']*86400:G4_SERVER_TIME+$config['cf_open_modify']*86400);?> 까지는 변경이 안됩니다.<br>
            이렇게 하는 이유는 잦은 정보공개 수정으로 인하여 쪽지를 보낸 후 받지 않는 경우를 막기 위해서 입니다.
        </span>
+        <input type="hidden" name="mb_open" value="<?=$member['mb_open']?>">
    </td>
 </tr>
 <? } ?>
--- a/mobile/skin/member/basic/scrap.skin.php
+++ b/mobile/skin/member/basic/scrap.skin.php
@ -9,20 +9,16 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    <caption>스크랩 목록</caption>
    <thead>
    <tr>
-        <th scope="col">번호</th>
        <th scope="col">게시판</th>
        <th scope="col">제목</th>
-        <th scope="col">보관일시</th>
        <th scope="col">삭제</th>
    </tr>
    </thead>
    <tbody>
    <? for ($i=0; $i<count($list); $i++) { ?>
    <tr>
-        <td class="td_num"><?=$list[$i]['num']?></td>
        <td class="td_board"><a href="<?=$list[$i]['opener_href']?>" target="_blank" onclick="opener.document.location.href='<?=$list[$i]['opener_href']?>'; return false;"><?=$list[$i]['bo_subject']?></a></td>
        <td><a href="<?=$list[$i]['opener_href_wr_id']?>" target="_blank" onclick="opener.document.location.href='<?=$list[$i]['opener_href_wr_id']?>'; return false;"><?=$list[$i]['subject']?></a></td>
-        <td class="td_datetime"><?=$list[$i]['ms_datetime']?></td>
        <td class="td_mng"><a href="<? echo $list[$i]['del_href']; ?>" onclick="del(this.href); return false;">삭제</a></td>
    </tr>
    <? } ?>
--- a/mobile/skin/search/basic/search.skin.php
+++ b/mobile/skin/search/basic/search.skin.php
@ -5,7 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <form name="fsearch" method="get" onsubmit="return fsearch_submit(this);">
 <input type="hidden" name="srows" value="<?=$srows?>">
 <fieldset id="sch_result_detail">
-    <legend class="sound_only">상세검색</legend>
+    <legend>상세검색</legend>
    <?=$group_select?>
    <script>document.getElementById("gr_id").value = "<?=$gr_id?>";</script>

@ -17,8 +17,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <option value="wr_name"<?=get_selected($_GET['sfl'], "wr_name")?>>이름</option>
    </select>

-    <input type="text" name="stx" class="fs_input" class="required" value="<?=$text_stx?>" maxlength="20" required title="검색어(필수)">
-    <input type="submit" class="fs_submit" value="검색">
+    <input type="text" name="stx" class="required" value="<?=$text_stx?>" maxlength="20" required title="검색어(필수)">
+    <input type="submit" value="검색">

    <script>
    function fsearch_submit(f)
@ -63,9 +63,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        <dt><strong><?=$stx?></strong>에 대한 검색 결과입니다.</dt>
        <dd>
            <ul>
-                <li><span style="color:<?=$config['cf_search_color']?>"><?=$board_count?></span>개의 게시판</li>
-                <li><span style="color:<?=$config['cf_search_color']?>"><?=number_format($total_count)?></span>개의 게시물</li>
-                <li>현재 <?=number_format($page)?>/<?=number_format($total_page)?> 페이지 열람 중</li>
+                <li>게시판 <span style="color:<?=$config['cf_search_color']?>"><?=$board_count?></span>개</li>
+                <li>게시물 <span style="color:<?=$config['cf_search_color']?>"><?=number_format($total_count)?></span>개</li>
+                <li><?=number_format($page)?>/<?=number_format($total_page)?> 페이지</li>
            </ul>
        </dd>
    </dl>
@ -115,7 +115,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
                    <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" class="sch_result_title"><?=$comment_def?><?=$list[$idx][$i][subject]?></a>
                    <a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" target="_blank">새창</a>
                    <p><?=$list[$idx][$i][content]?></p>
-                    <div class="sch_sideview"><?=$list[$idx][$i][name]?></div>
+                    <?=$list[$idx][$i][name]?>
                    <span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
                </li>
            <? } ?>