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:
gnuboard
2013-02-25 17:21:12 +09:00
parent 72aec2598a 8223c54483
commit 15ef622efc
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bbs/write_update.php
View File

@ -204,11 +204,11 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
// 서버에 설정된 값보다 큰파일을 업로드 한다면
if ($filename) {
if ($_FILES['bf_file']['error'][$i] == 1) {
$file_upload_msg .= '"'.$filename.'" 파일의 용량이 서버에 설정('.$upload_max_filesize.')된 값보다 크므로 업로드 할 수 없습니다.'.PHP_EOL;
$file_upload_msg .= '\"'.$filename.'\" 파일의 용량이 서버에 설정('.$upload_max_filesize.')된 값보다 크므로 업로드 할 수 없습니다.\\n';
continue;
}
else if ($_FILES['bf_file']['error'][$i] != 0) {
$file_upload_msg .= '"'.$filename.'" 파일이 정상적으로 업로드 되지 않았습니다.'.PHP_EOL;
$file_upload_msg .= '\"'.$filename.'\" 파일이 정상적으로 업로드 되지 않았습니다.\\n';
continue;
}
}
@ -216,7 +216,7 @@ for ($i=0; $i<count($_FILES['bf_file']['name']); $i++) {
if (is_uploaded_file($tmp_file)) {
// 관리자가 아니면서 설정한 업로드 사이즈보다 크다면 건너뜀
if (!$is_admin && $filesize > $board['bo_upload_size']) {
$file_upload_msg .= '"'.$filename.'" 파일의 용량('.number_format($filesize).' 바이트)이 게시판에 설정('.number_format($board['bo_upload_size']).' 바이트)된 값보다 크므로 업로드 하지 않습니다.'.PHP_EOL;
$file_upload_msg .= '\"'.$filename.'\" 파일의 용량('.number_format($filesize).' 바이트)이 게시판에 설정('.number_format($board['bo_upload_size']).' 바이트)된 값보다 크므로 업로드 하지 않습니다.\\n';
continue;
}

6
css/admin.css
View File

@ -48,19 +48,19 @@ h2 {font-size:1.2em}
/* gnb js off */
#gnb {}
#gnb ul {z-index:10}
.gnb_1depth {position:relative;margin-left:-1px;background:#383a3f;zoom:1}
.gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1depth a {display:inline-block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em}
.gnb_1depth a {display:block;float:left;width:90px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em !important;line-height:2.65em}
.gnb_1depth_air a,
.gnb_1depth_on a {color:#000}
.gnb_1depth a:focus,
.gnb_1depth a:hover,
.gnb_1depth a:active {text-decoration:none}
.gnb_1depth ul {float:left;zoom:1}
.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""}
.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1depth li {float:left}
.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0}
.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#e0e0e0;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em}
/* gnb js on */
.gnb_js {}

28
css/default.css
View File

@ -56,43 +56,43 @@ a:active {color:#000;text-decoration:underline}
/* gnb js off */
#gnb {background:#f0f4f8}
#gnb h2 {margin:0;padding:0;width:0;height:0;overflow:hidden}
#gnb ul {z-index:10;margin:0 auto;padding:0;width:980px;zoom:1}
#gnb ul:after {display:block;visibility:hidden;clear:both;content:""}
#gnb_ul {z-index:10;margin:0 auto;padding:0;width:980px}
.gnb_1depth {position:relative;margin-left:-1px;zoom:1}
.gnb_1depth:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1depth a {display:inline-block;float:left;height:35px;color:#fff;line-height:2.7em !important;line-height:2.4em}
.gnb_1depth a {display:block;float:left;height:35px;color:#000;line-height:2.7em !important;line-height:2.4em}
.gnb_1depth_air a,
.gnb_1depth_on a {color:#000}
.gnb_1depth a:focus,
.gnb_1depth a:hover,
.gnb_1depth a:active {text-decoration:none}
.gnb_1depth ul {float:left !important;margin:0 !important;padding:0 !important;width:auto !important;zoom:1}
.gnb_1depth ul:after {display:inline-block;visibility:hidden;clear:both;content:""}
.gnb_1depth ul {float:left;zoom:1}
.gnb_1depth ul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1depth li {float:left}
.gnb_1depth_over ul {top:35px;left:-1px;width:auto;height:auto;border:1px solid #ccc;border-top:0}
.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:5px;width:auto;height:25px;border-bottom:0;color:#fff;font-weight:normal;text-align:left;line-height:2.1em !important;line-height:1.8em}
.gnb_2depth a {display:inline-block;float:none;margin-right:10px;padding:0 5px;width:auto;height:35px;border-bottom:0;color:#000;font-weight:normal;text-align:left;line-height:2.7em !important;line-height:2.4em}
/* gnb js on */
.gnb_js {border-bottom:1px solid #c3c7c5;background:#fff}
.gnb_js ul {zoom:1}
.gnb_js ul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_js .gnb_1depth {position:relative;float:left;margin-left:-1px}
.gnb_js .gnb_1depth a {display:block;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;letter-spacing:-0.1em;line-height:2.1em}
.gnb_js .gnb_1depth a {display:inline-block;float:none;padding:0 15px;height:35px;border:1px solid #e0e5e9;border-top:0;border-bottom:0;color:#000;font-size:1.1em;font-weight:bold;text-align:center;letter-spacing:-0.1em;line-height:2.1em}
.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000}
.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1depth a:focus,
.gnb_js .gnb_1depth a:hover,
.gnb_js .gnb_1depth a:active {text-decoration:none}
.gnb_js .gnb_1depth_air a {float:none;background:#f7f7f2;color:#000}
.gnb_js .gnb_1depth_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1depth ul {width:0 !important;height:0 !important;overflow:hidden}
.gnb_js .gnb_1depth ul {width:1px !important;height:0 !important;overflow:hidden}
.gnb_js .gnb_1depth li {float:none}
.gnb_js .gnb_1depth_over ul {position:absolute;top:35px;left:0;width:181px !important;height:auto !important;border:1px solid #c3c7c5;border-top:0}
.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em}
.gnb_js .gnb_2depth a {display:inline-block;margin:0;padding:5px 10px;width:161px;height:25px;border:0;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:2.1em !important}
/* 중간 레이아웃 */
#wrapper {margin:50px auto;width:980px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#lnb {float:right;width:209px;border:1px solid #e7f1ed;background:#fff}
#lnb {float:right;width:209px;border:1px solid #d5d9d7;background:#fff}
#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #e7f1ed;background:#fff;zoom:1}
#container {position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #d5d9d7;background:#fff;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
/* 하단 레이아웃 */

3
skin/member/basic/register.skin.php
View File

@ -4,6 +4,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<form id="fregister" name="fregister" method="POST" action="<?=$register_action_url?>" onsubmit="return fregister_submit(this);" autocomplete="off">
<p>회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.</p>
<section id="fregister_term">
<h2>회원가입약관</h2>
<textarea readonly><?=get_text($config['cf_stipulation'])?></textarea>
@ -23,7 +25,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</section>
<div class="btn_confirm">
<p>회원가입약관 및 개인정보수집이용안내의 내용에 동의하셔야 회원가입 하실 수 있습니다.</p>
<input type="submit" class="btn_submit" value="회원가입">
</div>