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

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-06-25 08:49:56 +09:00
parent 08fe3fd5cf 972c6b711e
commit 6668fbf823
9 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/config_form.php
View File

@ -773,7 +773,7 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="cf_add_script">추가 script, css</label></th>
<td>
<?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
<textarea name="cf_add_script" id="cf_add_script"><?php echo $config['cf_add_script'] ?></textarea>
<textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($config['cf_add_script']); ?></textarea>
</td>
</tr>
</tbody>

2
adm/visit_domain.php
View File

@ -70,7 +70,7 @@ while ($row=sql_fetch_array($result)) {
$link2 = '';
$key = '직접';
} else {
$link = '<a href="./visit_list.php?$qstr&amp;domain='.$key.'">';
$link = '<a href="./visit_list.php?'.$qstr.'&amp;domain='.$key.'">';
$link2 = '</a>';
}

2
css/default.css
View File

@ -175,7 +175,7 @@ td.empty_table {padding:85px 0;text-align:center}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top}
.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle}
.frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff}
.frm_tbl textarea {width:90%;height:150px}
.frm_tbl textarea {width:98%;height:100px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}
.frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}

10
skin/board/basic/list.skin.php
View File

@ -128,20 +128,20 @@ if ($is_nogood) $colspan++;
<?php if ($list_href || $is_checkbox || $write_href) { ?>
<div class="bo_fx">
<?php if ($is_checkbox) { ?>
<ul class="btn_bo_adm">
<?php if ($list_href) { ?>
<li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
<?php } ?>
<?php if ($is_checkbox) { ?>
<li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
<?php } ?>
</ul>
<?php } ?>
<?php if ($list_href || $write_href) { ?>
<ul class="btn_bo_user">
<?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
<?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
</form>

2
skin/board/basic/view.skin.php
View File

@ -168,7 +168,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</section>
<?php
include(G4_SNS_PATH."/view.sns.skin.php");
include_once(G4_SNS_PATH."/view.sns.skin.php");
?>
<?php

4
skin/board/basic/view_comment.skin.php
View File

@ -124,10 +124,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php
include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<?php
@include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
?>
<tr>
<th scope="row">내용</th>
<td>

13
skin/board/gallery/list.skin.php
View File

@ -124,23 +124,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<?php if ($list_href || $is_checkbox || $write_href) { ?>
<div class="bo_fx">
<?php if ($is_checkbox) { ?>
<ul class="btn_bo_adm">
<?php if ($list_href) { ?>
<li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
<?php } ?>
<?php if ($is_checkbox) { ?>
<li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
<?php } ?>
</ul>
<?php } ?>
<?php if ($list_href || $write_href) { ?>
<ul class="btn_bo_user">
<li><?php if ($write_href) { ?><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a><?php } ?></li>
<?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
<?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
</ul>
<?php } ?>
</div>
<?php } ?>
</form>
</div>

3
skin/search/basic/search.skin.php
View File

@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</select>
<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="stx" value="<?php echo $text_stx ?>" class="frm_input" required class="required" maxlength="20">
<input type="text" name="stx" value="<?php echo $text_stx ?>" id="stx" required class="frm_input required" maxlength="20">
<input type="submit" class="btn_submit" value="검색">
<script>
@ -113,6 +113,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$comment_href = "#c_".$list[$idx][$i][wr_id];
}
?>
<li>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" class="sch_res_title"><?php echo $comment_def ?><?php echo $list[$idx][$i][subject] ?></a>
<a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" target="_blank">새창</a>

1
skin/search/basic/style.css
View File

@ -20,4 +20,5 @@
.sch_res_list h2 {margin:0 0 15px;font-size:1.2em}
.sch_res_list ul {margin:0;padding:0;list-style:none}
.sch_res_list li {margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #e9e9e9}
.sch_res_title {font-weight:bold}
.sch_more {text-align:right}