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-01-16 10:43:21 +09:00
parent 2fd1593892 3cc622a821
commit 607dfd0c2d
3 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
css/default.css
View File

@ -100,17 +100,18 @@ a {color:#000;text-decoration:none}
#ol_before fieldset {margin:0;padding:0;border:0;background:transparent}
#ol_before legend {position:absolute;padding:0;width:0;height:0;border:0;background:transparent;overflow:hidden}
#ol_before input:focus {background:#333;color:#fff}
#ol_mb_id{display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
#ol_mb_id_label {z-index:2;position:absolute;top:23px;left:20px;color:#696969}
#ol_mb_pw {display:block;padding:0 5px;width:120px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
#ol_mb_pw_label {z-index:2;position:absolute;top:50px;left:20px;color:#696969}
#auto_login {position:absolute;top:74px;left:13px}
#auto_login_label {position:absolute;top:76px;left:30px;color:#696969;letter-spacing:-0.1em}
#ol_before ul {position:relative;top:0;left:112px;margin:10px 0;width:90px;zoom:1}
#ol_id {display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
.ol_idlabel {position:absolute;top:23px;left:20px;color:#696969}
#ol_pw {display:block;margin-bottom:3px;padding:0 5px;width:185px;height:22px;border:1px solid #d7d7d7;background:#fff;line-height:1.6em}
.ol_pwlabel {position:absolute;top:50px;left:20px;color:#696969}
#auto_login {}
#auto_login_label {color:#696969;letter-spacing:-0.1em}
#ol_submit {width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em}
#ol_before ul {float:right;margin:10px 0;width:199px;zoom:1}
#ol_before ul:after {display:block;visibility:hidden;clear:both;content:""}
#ol_before li {float:left;margin-right:5px}
#ol_before li {float:right;margin-right:5px;padding-top:2px}
#ol_before #ol_auto {float:left;margin:0;padding:0}
#ol_before a {color:#696969;letter-spacing:-0.1em}
#ol_submit {position:absolute;top:42px;right:12px;width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em}
/* 아웃로그인 후 */
#ol_after {width:219px;color:#000;font-size:0.75em}
#ol_after_hd {position:relative;padding:15px 10px 11px}
@ -274,33 +275,35 @@ a {color:#000;text-decoration:none}
#current_connect_tbl .td_name {text-align:center}
/* 전체검색 */
#sch_result_detail {margin:0;padding:15px 0;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ddd;background:#eee;text-align:center}
#sch_result_detail {margin:0;padding:15px 0;border:0;text-align:right}
#sch_result_detail label {font-size:0.75em}
#sch_result_hd {margin:0;border:0;background:#fff;font-size:0.75em}
#sch_result_hd dt {padding:10px;border-bottom:1px solid #eee;background:#fbfbfb}
#sch_result_hd dd {margin:0;padding:0}
#sch_result_hd ul {padding:0;list-style:none;zoom:1}
#sch_result_hd ul:after {display:block;visibility:hidden;clear:both;content:""}
#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #999}
#sch_result {position:relative;padding:30px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y}
#sch_result dl {margin:0;padding:0}
#sch_result {position:relative;padding:10px 0 0 200px;border-top:1px solid #ddd;border-bottom:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y}
#sch_result dl {padding:0}
#sch_result dt {font-weight:bold}
#sch_result ul {margin:0;padding:0;list-style:none}
#sch_result p {margin:5px 0;padding:0;font-size:0.75em}
#sch_result_bo {position:absolute;top:0;left:0;width:170px;font-size:0.875em}
#sch_result_hd {margin:0 0 20px;border-bottom:1px solid #eee;background:#fff;font-size:0.75em;zoom:1}
#sch_result_hd:after {display:block;visibility:hidden;clear:both;content:""}
#sch_result_hd dt {float:left;padding:10px 0 15px}
#sch_result_hd dd {float:right;margin:0;padding:10px 0 15px}
#sch_result_hd ul {float:left;padding:0;list-style:none}
#sch_result_hd li {float:left;padding:0 10px;border-right:1px solid #ddd}
#sch_result_bo {position:absolute;top:0;left:0;margin:0;width:170px;font-size:0.875em}
#sch_result_bo dt {margin:0;padding:0;height:0;border:0;overflow:hidden}
#sch_result_bo dd {margin:0}
#sch_result_bo li {position:relative;margin-top:-1px}
#sch_result_bo a {display:inline-block;padding:10px 0 10px 10px;width:160px;border:1px solid #ddd;background:#eee}
#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff}
#sch_result_bo .sch_on {width:161px;border-right:0;background:#fff;font-weight:bold}
#sch_result_bo .cnt_cmt {color:#000}
#sch_result_atc li {padding:10px 0}
#sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:0.75em}
#sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd}
#sch_result_atc p {color:#888}
#sch_result_atc li {padding:10px 0}
#sch_result_atc li a {font-size:0.875em}
#sch_result_atc p {margin-top:15px}
.sch_more {padding:10px 0 15px;font-size:0.75em;text-align:right}
.sch_sideview {display:inline-block;font-size:0.75em}
.sch_datetime {font-size:0.75em}
.sch_more a {color:#818385}
.sch_sideview {display:inline-block;font-size:0.875em}
.sch_datetime {color:#818385;font-size:0.75em}
/* 게시판 목록 */
#btn_bo_adm {text-align:center}

30
skin/outlogin/neo/outlogin.skin.1.php
View File

@ -8,14 +8,16 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<form name="foutlogin" method="post" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" autocomplete="off">
<fieldset>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<label for="ol_mb_id" id="ol_mb_id_label">회원아이디</label>
<input type="text" id="ol_mb_id" name="mb_id" maxlength="20" required title="회원아이디">
<label for="ol_mb_pw" id="ol_mb_pw_label">패스워드</label>
<input type="password" id="ol_mb_pw" name="mb_password" maxlength="20" required title="패스워드">
<input type="checkbox" id="auto_login" name="auto_login" value="1">
<label for="auto_login" id="auto_login_label">자동로그인</label>
<label for="ol_id" id="ol_idlabel">회원아이디</label>
<input type="text" id="ol_id" name="mb_id" maxlength="20" required title="회원아이디">
<label for="ol_pw" id="ol_pwlabel">패스워드</label>
<input type="password" id="ol_pw" name="mb_password" maxlength="20" required title="패스워드">
<input type="submit" id="ol_submit" value="로그인">
<ul>
<li id="ol_auto">
<input type="checkbox" id="auto_login" name="auto_login" value="1">
<label for="auto_login" id="auto_login_label">자동로그인</label>
</li>
<li><a href="<?=$g4['bbs_url']?>/register.php">회원가입</a></li>
<li><a href="<?=$g4['bbs_url']?>/password_lost.php" id="ol_password_lost">정보찾기</a></li>
</ul>
@ -25,10 +27,14 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<script>
$(function(){
$omi = $('#ol_mb_id');
$omp = $('#ol_mb_pw');
$omi_label = $('#ol_mb_id_label');
$omp_label = $('#ol_mb_pw_label');
$omi = $('#ol_id');
$omp = $('#ol_pw');
$omp.css('display','inline-block');
$omp.css('width',121);
$omi_label = $('#ol_idlabel');
$omp_label = $('#ol_pwlabel');
$omi_label.addClass('ol_idlabel');
$omp_label.addClass('ol_pwlabel');
$omi.focus(function() {
$omi_label.css('visibility','hidden');
});
@ -37,11 +43,11 @@ $(function(){
});
$omi.blur(function() {
$this = $(this);
if($this.attr('id') == "ol_mb_id" && $this.attr('value') == "") $omi_label.css('visibility','visible');
if($this.attr('id') == "ol_id" && $this.attr('value') == "") $omi_label.css('visibility','visible');
});
$omp.blur(function() {
$this = $(this);
if($this.attr('id') == "ol_mb_pw" && $this.attr('value') == "") $omp_label.css('visibility','visible');
if($this.attr('id') == "ol_pw" && $this.attr('value') == "") $omp_label.css('visibility','visible');
});
$("#auto_login").click(function(){

33
skin/search/neo/search.skin.php
View File

@ -57,24 +57,23 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</fieldset>
</form>
<? if ($stx) { ?>
<? if ($board_count) { ?>
<dl id="sch_result_hd">
<dt>검색어 <strong><?=$stx?></strong>에 대한 결과입니다.</dt>
<dd>
<ul>
<li><span class="highlight"><?=$board_count?></span>개의 게시판</li>
<li><span class="highlight"><?=number_format($total_count)?></span>개의 게시글</li>
<li>현재 <?=number_format($page)?>/<?=number_format($total_page)?> 페이지 열람 중</li>
</ul>
</dd>
</dl>
<? } ?>
<? } ?>
<div id="sch_result">
<? if ($stx) { ?>
<? if ($board_count) { ?>
<dl id="sch_result_hd">
<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>
</ul>
</dd>
</dl>
<? } ?>
<? } ?>
<?
if ($stx) {
if ($board_count) {
@ -115,10 +114,10 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<li>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><b><?=$list[$idx][$i][subject]?></b></a>
<span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
<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>
<span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
</li>
<? } ?>
</ul>