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

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>