firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
chicpro
2013-02-20 16:10:46 +09:00
parent 913696689f 7870d22b1f
commit c27efff4cb
7 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/board_form.php
View File

@ -594,7 +594,7 @@ $pg_anchor = "<ul class=\"anchor\">
</td>
</tr>
<tr>
<th scope="row"><label for="tx_bo_content_head">상단 내용</label></th>
<th scope="row"><label for="bo_content_head">상단 내용</label></th>
<td>
<?=editor_html("bo_content_head", $board['bo_content_head']);?>
</td>
@ -604,7 +604,7 @@ $pg_anchor = "<ul class=\"anchor\">
</td>
</tr>
<tr>
<th scope="row"><label for="tx_bo_content_tail">하단 내용</label></th>
<th scope="row"><label for="bo_content_tail">하단 내용</label></th>
<td>
<?=editor_html("bo_content_tail", $board['bo_content_tail']);?>
</td>
@ -825,7 +825,7 @@ $pg_anchor = "<ul class=\"anchor\">
<td>
<label for="bo_<?=$i?>_subj">여분필드 <?=$i?> 제목</label>
<input type="text" id="bo_<?=$i?>_subj" name="bo_<?=$i?>_subj" class="frm_input" value="<?=get_text($board['bo_'.$i.'_subj'])?>">
<label for="bo_<?=$i?>">여분필드 <?=$i?> 내용</label>
<label for="bo_<?=$i?>">여분필드 <?=$i?> 값</label>
<input type="text" id="bo_<?=$i?>" name="bo_<?=$i?>" class="frm_input" value="<?=get_text($board['bo_'.$i])?>">
</td>
<td class="group_setting">

2
adm/config_form.php
View File

@ -544,7 +544,7 @@ $pg_anchor = "
<td>
<label for="cf_<?=$i?>_subj">여분필드<?=$i?> 제목</label>
<input type="text" id="cf_<?=$i?>_subj" name="cf_<?=$i?>_subj" class="frm_input" value="<?=get_text($config['cf_'.$i.'_subj'])?>" size="30">
<label for="cf_<?=$i?>">여분필드<?=$i?> 설명</label>
<label for="cf_<?=$i?>">여분필드<?=$i?> 값</label>
<input type="text" id="cf_<?=$i?>" name="cf_<?=$i?>" class="frm_input" value="<?=$config['cf_'.$i]?>" size="30">
</td>
</tr>

4
bbs/list.php
View File

@ -149,13 +149,13 @@ if ($sca || $stx) {
$prev_spt = $spt - $config['cf_search_part'];
if (isset($min_spt) && $prev_spt >= $min_spt) {
$prev_part_href = './board.php?bo_table='.$bo_table.$qstr.'&amp;spt='.$prev_spt.'&amp;page=1';
$write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'">이전검색</a>');
$write_pages = page_insertbefore($write_pages, '<a href="'.$prev_part_href.'" class="pg_page pg_prev">이전검색</a>');
}
$next_spt = $spt + $config['cf_search_part'];
if ($next_spt < 0) {
$next_part_href = './board.php?bo_table='.$bo_table.$qstr.'&amp;spt='.$next_spt.'&amp;page=1';
$write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'">다음검색</a>');
$write_pages = page_insertafter($write_pages, '<a href="'.$next_part_href.'" class="pg_page pg_end">다음검색</a>');
}
}

8
css/adm.css
View File

@ -130,11 +130,15 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
#btn_add {margin-bottom:10px;text-align:right}
#btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
/* 필수입력 */
.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat !important}
/* 폼 */
label {vertical-align:middle}
textarea, .frm_input {padding:2px;border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}
textarea:focus,
.frm_input:focus {border-color:#000;background:#434f54;color:#fff}
.frm_input:focus,
.required:focus {border-color:#000;background:#434f54 !important;color:#fff}
textarea {width:90%}
select {border:1px solid #ced9de}
button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer}
@ -251,7 +255,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_boolean {width:50px;text-align:center}
.td_pt {text-align:right !important}
.txt_true {color:#2a6bc4}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}
/* 관리권한설정 */

6
css/default.css
View File

@ -122,6 +122,9 @@ a:active {color:#000;text-decoration:underline}
.bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
td.empty_table {padding:85px 0;text-align:center}
/* 필수입력 */
.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat !important}
/* 폼 테이블 */
.frm_tbl {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
.frm_tbl caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left}
@ -130,7 +133,8 @@ td.empty_table {padding:85px 0;text-align:center}
.frm_tbl textarea,
.frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle}
.frm_tbl textarea:focus,
.frm_input:focus {padding:3px 3px 4px;border:0;background:#21272e;color:#fff}
.frm_input:focus,
.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff}
.frm_tbl textarea {width:90%;height:150px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}

19
js/wrest.js
View File

@ -1,7 +1,5 @@
var wrestMsg = "";
var wrestFld = null;
var wrestFldDefaultColor = "";
var wrestFldBackColor = "#ff3061";
// subject 속성값을 얻어 return, 없으면 tag의 name을 넘김
function wrestItemname(fld)
@ -284,8 +282,6 @@ function wrestSubmit()
var array_css = el.className.split(" "); // class 를 공백으로 나눔
el.style.backgroundColor = wrestFldDefaultColor;
// 배열의 길이만큼 돌려라
for (var k=0; k<array_css.length; k++) {
var css = array_css[k];
@ -323,7 +319,6 @@ function wrestSubmit()
alert(wrestMsg);
if (wrestFld.style.display != "none") {
wrestFld.style.backgroundColor = wrestFldBackColor;
if (typeof(wrestFld.select) != "undefined")
wrestFld.select();
wrestFld.focus();
@ -350,20 +345,6 @@ function wrestInitialized()
document.forms[i].oldsubmit = document.forms[i].onsubmit;
}
document.forms[i].onsubmit = wrestSubmit;
// 이 부분은 CSS 로 대체를 합니다. github issue #282, 지운아빠 작업예정
for (var j = 0; j < document.forms[i].elements.length; j++) {
// 필수 입력일 경우는 * 배경이미지를 준다.
if (document.forms[i].elements[j].getAttribute("required") != null ||
regexp.test(document.forms[i].elements[j].className)) {
//if (regexp.test(document.forms[i].elements[j].className)) {
//document.forms[i].elements[j].style.backgroundColor = wrestFldDefaultColor;
//document.forms[i].elements[j].className = "wrest_required";
document.forms[i].elements[j].style.backgroundImage = "url('"+g4_img_url+"/wrest.gif')";
document.forms[i].elements[j].style.backgroundPosition = "top right";
document.forms[i].elements[j].style.backgroundRepeat = "no-repeat";
}
}
}
}

4
skin/outlogin/basic/outlogin.skin.1.php
View File

@ -9,9 +9,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<fieldset>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<label for="ol_id" id="ol_idlabel">회원아이디<strong class="sound_only">필수</strong></label>
<input type="text" id="ol_id" name="mb_id" maxlength="20" required>
<input type="text" id="ol_id" name="mb_id" class="required" maxlength="20" required>
<label for="ol_pw" id="ol_pwlabel">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" id="ol_pw" name="mb_password" maxlength="20" required>
<input type="password" id="ol_pw" name="mb_password" class="required" maxlength="20" required>
<input type="submit" id="ol_submit" value="로그인">
<div id="ol_svc">
<a href="<?=G4_BBS_URL?>/register.php"><b>회원가입</b></a>