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

This commit is contained in:
chicpro
2012-12-14 17:18:05 +09:00
20 changed files with 73 additions and 54 deletions

View File

@ -5,7 +5,7 @@ if (!defined("_GNUBOARD_")) exit;
</div>
<footer>
푸터
<p>Copyright &copy; 소유하신 도메인. All rights reserved.</p>
</footer>
<!-- <p>실행시간 : <?=get_microtime() - $begin_time;?> -->

View File

@ -71,7 +71,7 @@ var list_delete_php = 'auth_list_delete.php';
</span>
<label for="stx">회원아이디</label>
<input type="text" id="stx" name="stx" required value="<?=$stx?>">
<input type="submit" id="fsearch_submit" value="검색">
<input type="submit" id="fsearch_submit" class="fieldset_submit" value="검색">
</fieldset>
</form>
@ -138,7 +138,9 @@ if ($i==0)
$pagelist = get_paging($config[cf_write_pages], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
?>
<div class="btn_list"><input type="button" value="선택삭제" onclick="btn_check(this.form, 'delete')"></div>
<div class="btn_list">
<input type="button" value="선택삭제" onclick="btn_check(this.form, 'delete')">
</div>
<div class="pg">
<?=$pagelist?>

View File

@ -854,9 +854,9 @@ if (!preg_match("/([m|M])$/", $upload_max_filesize)) {
</fieldset>
<div class="btn_confirm">
<input type="submit" accesskey="s" value="확인">
<input type="button" value="목록" onclick="document.location.href='./board_list.php?<?=$qstr?>';">
<? if ($w == 'u') { ?><input type="button" value="게시판 복사" onclick="board_copy('<?=$bo_table?>');"><?}?>
<input type="submit" class="btn_submit" accesskey="s" value="확인">
<button onclick="document.location.href='./board_list.php?<?=$qstr?>';">목록</button>
<? if ($w == 'u') { ?><button onclick="board_copy('<?=$bo_table?>');">게시판복사</button><?}?>
</div>
</form>

View File

@ -88,7 +88,7 @@ var list_delete_php = 'board_list_delete.php';
<option value="a.gr_id">그룹ID</option>
</select>
<input type="text" name="stx" required value="<?=$stx?>" title="검색어">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -98,8 +98,8 @@ include_once('./admin.head.php');
</table>
<div class="btn_confirm">
<input type="submit" accesskey="s" value="확인">
<input type="button" value='목록' onclick="document.location.href='./boardgroup_list.php?<?=$qstr?>';">
<input type="submit" class="btn_submit" accesskey="s" value="확인">
<button onclick="document.location.href='./boardgroup_list.php?<?=$qstr?>';">목록</button>
</div>
</form>

View File

@ -78,7 +78,7 @@ var list_update_php = "./boardgroup_list_update.php";
</select>
<label for="stx">검색어</label>
<input type="text" id="stx" name="stx" required value="<?=$stx?>">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -76,7 +76,7 @@ if ($i == 0) {
}
?>
</select>
<input type="submit" value="완료" accesskey="s">
<input type="submit" class="fieldset_submit" value="완료" accesskey="s">
<p>게시판 그룹이 존재하지 않는다면 <a href="./boardgroup_form.php">게시판그룹생성하기</a></p>
</fieldset>
</form>

View File

@ -66,7 +66,7 @@ $colspan = 7;
<option value='a.mb_id'>회원아이디</option>
</select>
<input type="text" id="stx" name="stx" required value="<? echo $stx ?>" title="검색어">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -499,7 +499,7 @@ include_once ('./admin.head.php');
</fieldset>
<div class="btn_confirm">
<input type="submit" accesskey="s" value="확인">
<input type="submit" class="btn_submit" accesskey="s" value="확인">
</div>
</form>

View File

@ -115,16 +115,16 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
?>
<tr>
<td class="td_mbid"><?=$mb_id?></td>
<td><?=$mb_id?></td>
<td class="td_mbname"><?=$row['mb_name']?></td>
<td class="td_mbnick"><?=$mb_nick?></td>
<td class="td_num"><?=$row[mb_level]?></td>
<td><a href="./point_list.php?sfl=mb_id&amp;stx=<?=$row['mb_id']?>"><?=number_format($row[mb_point])?></a></td>
<td class="td_bignum"><a href="./point_list.php?sfl=mb_id&amp;stx=<?=$row['mb_id']?>"><?=number_format($row[mb_point])?></a></td>
<td class="td_boolean"><?=$row[mb_mailling]?'예':'아니오';?></td>
<td class="td_boolean"><?=$row[mb_open]?'예':'아니오';?></td>
<td class="td_boolean"><?=preg_match('/[1-9]/', $row['mb_email_certify'])?'예':'아니오';?></td>
<td class="td_boolean"><?=$row['mb_intercept_date']?'예':'아니오';?></td>
<td><?=$group?></td>
<td class="td_category"><?=$group?></td>
</tr>
<?
}
@ -214,11 +214,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
?>
<tr>
<td><a href="<?=$g4['bbs_path']?>/new.php?gr_id=<?=$row['gr_id']?>"><?=cut_str($row['gr_subject'],10)?></a></td>
<td><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$row['bo_table']?>"><?=cut_str($row['bo_subject'],20)?></a></td>
<td class="td_category"><a href="<?=$g4['bbs_path']?>/new.php?gr_id=<?=$row['gr_id']?>"><?=cut_str($row['gr_subject'],10)?></a></td>
<td class="td_category"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$row['bo_table']?>"><?=cut_str($row['bo_subject'],20)?></a></td>
<td><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$row['bo_table']?>&amp;wr_id=<?=$row2[wr_id]?><?=$comment_link?>"><?=$comment?><?=conv_subject($row2['wr_subject'], 100)?></a></td>
<td><?=$name?></td>
<td><?=$datetime?></td>
<td class="td_mbname"><?=$name?></td>
<td class="td_time"><?=$datetime?></td>
</tr>
<?
@ -291,13 +291,13 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
?>
<tr>
<td><a href="./point_list.php?sfl=mb_id&amp;stx=<?=$row['mb_id']?>"><?=$row['mb_id']?></a></td>
<td><?=$row2['mb_name']?></td>
<td><?=$mb_nick?></td>
<td><?=$row['po_datetime']?></td>
<td class="td_mbid"><a href="./point_list.php?sfl=mb_id&amp;stx=<?=$row['mb_id']?>"><?=$row['mb_id']?></a></td>
<td class="td_mbname"><?=$row2['mb_name']?></td>
<td class="td_mbnick"><?=$mb_nick?></td>
<td class="td_time"><?=$row['po_datetime']?></td>
<td><?=$link1.$row['po_content'].$link2?></td>
<td><?=number_format($row[po_point])?></td>
<td><?=number_format($row2[mb_point])?></td>
<td class="td_bignum"><?=number_format($row[po_point])?></td>
<td class="td_bignum"><?=number_format($row2[mb_point])?></td>
</tr>
<?

View File

@ -47,7 +47,7 @@ include_once('./admin.head.php');
</table>
<div class="btn_confirm">
<input type="submit" accesskey="s" value="확인">
<input type="submit" class="btn_submit" accesskey="s" value="확인">
</div>
</form>

View File

@ -240,17 +240,17 @@ include_once('./admin.head.php');
</table>
<fieldset id="admin_confirm">
<legend><span></span>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드</label>
<input type="password" id="admin_password" name="admin_password" required title="관리자 패스워드">
<legend><span></span>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드</label>
<input type="password" id="admin_password" name="admin_password" required title="관리자 패스워드">
</fieldset>
<div class="btn_confirm">
<input type="submit" accesskey='s' value="확인">
<input type="button" value="목록" onclick="document.location.href='./member_list.php?<?=$qstr?>';">
<input type="submit" class="btn_submit" accesskey='s' value="확인">
<button onclick="document.location.href='./member_list.php?<?=$qstr?>';">목록</button>
<? if ($w != '') { ?>
<input type="button" value="삭제" onclick="del('./member_delete.php?<?=$qstr?>&amp;w=d&amp;mb_id=<?=$mb['mb_id']?>&amp;url=<?=$_SERVER['PHP_SELF']?>');">
<button onclick="del('./member_delete.php?<?=$qstr?>&amp;w=d&amp;mb_id=<?=$mb['mb_id']?>&amp;url=<?=$_SERVER['PHP_SELF']?>');">삭제</button>
<? } ?>
</div>
</form>

View File

@ -117,7 +117,7 @@ var list_delete_php = 'member_list_delete.php';
</select>
<label for="stx">검색어</label>
<input type="text" id="stx" name="stx" required value="<?=$stx ?>">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>
@ -232,7 +232,7 @@ if ($i == 0)
?>
</table>
<div class="btn_confirm">
<div class="btn_list">
<input type="button" value="선택수정" onclick="btn_check(this.form, 'update')">
<input type="button" value="선택삭제" onclick="btn_check(this.form, 'delete')">
<? if ($is_admin == 'super') {?><a href="./member_form.php">회원추가</a><?}?>

View File

@ -97,7 +97,7 @@ function point_clear()
<option value="po_content">내용</option>
</select>
<input type="text" id="stx" name="stx" required value="<?=$stx?>" title="검색어">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -95,8 +95,8 @@ for ($i=1; $i<=9; $i++) {
</table>
<div class="btn_confirm">
<input type="submit" accesskey="s" value="확인">
<input type="button" value="목록" onclick="document.location.href='./poll_list.php?<?=$qstr?>';">
<input type="submit" class="btn_submit" accesskey="s" value="확인">
<button onclick="document.location.href='./poll_list.php?<?=$qstr?>';">목록</button>
</div>
</form>

View File

@ -65,7 +65,7 @@ $colspan = 6;
<option value='po_subject'>제목</option>
</select>
<input type="text" name="stx" required value="<?=$stx?>" title="검색어">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -84,7 +84,7 @@ var list_delete_php = 'popular_list.php';
<option value="pp_date">등록일</option>
</select>
<input type="text" name="stx" required value="<?=$stx?>" title="검색어">
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>
@ -131,7 +131,7 @@ if ($i == 0)
</table>
<?if ($is_admin == 'super'){ ?>
<div>
<div class="btn_list">
<input type="button" value="선택삭제" onclick="btn_check(this.form, 'delete')">
</div>
<?}?>

View File

@ -51,7 +51,7 @@ $colspan = 3;
</span>
<label for="fr_date">기간설정</label>
<input type="text" id="fr_date" name="fr_date" maxlength="10" value="<?=$fr_date?>" title="구간시작일"> 부터 <input type="text" id="to_date" name="to_date" maxlength="10" value="<?=$to_date?>" title="구간종료일"> 까지
<input type="submit" value="검색">
<input type="submit" class="fieldset_submit" value="검색">
</fieldset>
</form>

View File

@ -45,8 +45,8 @@ $token = get_token();
<fieldset>
<legend>테스트메일 발송</legend>
<label for="mail">받는 메일주소</label>
<input type="text" id="mail" name="mail" required value="<?=$member['mb_email']?>">
<input type="submit" value="발송">
<input type="text" id="mail" name="mail" required value="<?=$member['mb_email']?>" size="80">
<input type="submit" class="fieldset_submit" value="발송">
</fieldset>
</form>

View File

@ -7,7 +7,7 @@ header ul, nav ul {margin:0;padding:0;list-style:none}
table {border-collapse:collapse;border-spacing:0} tfoot td {text-align:center}
form, img {border:0}
img {vertical-align:middle}
p {margin:10px 0}
p {margin:10px 0;line-height:1.5em}
/* 내용 건너띄기 */
#skip_to_main {display:block;position:absolute;top:0;left:0;margin:5px;height:0;text-decoration:none;overflow:hidden}
@ -30,8 +30,11 @@ header {background:#2c2f34}
#current_location li {float:left}
#wrapper {margin:60px 10px 0 210px;min-height:630px;height:auto !important;height:630px}
/* 헤딩 (아 머리 아퍼) */
h1 {margin-bottom:20px}
footer {margin:20px 0;padding:5px 20px;border-top:1px solid #d0d6d8}
footer p {color:#576a71}
/* 헤딩 */
h1 {margin-bottom:20px;font-family:"verdana","dotum";letter-spacing:-0.1em}
/* GNB */
#gnb {position:absolute;top:110px;left:20px;width:180px}
@ -44,18 +47,32 @@ h1 {margin-bottom:20px}
.gnb_2depth a {display:block;padding-left:15px;height:30px;background:#fff;color:#000;font:0.75em normal;text-decoration:none;line-height:2.8em}
.gnb_2depth a:focus, .gnb_2depth a:hover {background:#f6f9fa}
/* 폼요소 */
/* 버튼 */
.btn_confirm {margin-bottom:20px;text-align:center}
.btn_confirm button {padding:0 15px;height:30px;background:#74868b;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_confirm button:focus {padding:0 15px;height:30px;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_submit {padding:0 15px;height:30px;border:0;background:#ff6633;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_submit:focus {padding:0 15px;height:30px;border:0;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_list input {padding:0 15px;height:30px;background:#74868b;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_list input:focus {padding:0 15px;height:30px;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
.btn_list a {display:inline-block;padding:0 15px;height:28px;background:#74868b;color:#fff;font-size:0.875em;text-decoration:none;line-height:2.1em;vertical-align:middle}
.btn_list a:focus {padding:0 15px;height:30px;background:#555;color:#fff;font-size:0.875em;line-height:2.2em;vertical-align:middle}
/* 폼 */
label {vertical-align:middle}
textarea, input, select {border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}
textarea, input {padding:3px}
textarea:focus, input:focus {padding:4px;border:0;background:#9aacb4;color:#fff}
textarea {width:90%}
select {padding:2px}
fieldset {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.8em}
fieldset p {color:#6b8088}
fieldset span {display:inline-block;margin-right:10px;vertical-align:middle}
legend {margin-left:0;padding:7px 10px;border:1px solid #ced9de;background:#f6f9fa}
button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer}
fieldset {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.8em}
fieldset p {color:#6b8088}
fieldset span {display:inline-block;margin-right:10px;padding-right:10px;border-right:1px solid #ddd;vertical-align:middle}
fieldset button, .fieldset_submit {padding:0 15px;height:24px;border:0;background:#74868b;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle}
fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border:0;background:#555;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle}
.readonly {background:#ff3061}
.adm_field_explain {display:block;padding:0 0 5px;color:#768f99}
@ -69,8 +86,8 @@ button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer}
.frm_list a:focus, .frm_list a:hover {background:#f6f9fa}
/* 테이블 */
table {margin-bottom:20px;width:100%;border:1px solid #d5dcdf;background:#fff}
caption {padding-bottom:15px;color:#5b7c89;text-align:left;font-size:1em;font-weight:bold}
table {margin-bottom:10px;width:100%;border:1px solid #d5dcdf;background:#fff}
caption {padding:10px 0 15px;color:#5b7c89;text-align:left;font-size:1em;font-weight:bold}
caption p {margin:7px 0 0;padding:0;color:#6b8088;font:0.75em normal}
th, td {border-bottom:1px solid #e9ecee;font-size:0.75em}
th label {display:block}